From 2ac6718f9dd36d561cd88353ac8283f9857fc925 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 3 Mar 2008 13:54:05 +0000 Subject: [PATCH] ioemu: Fix segfault when creating qcow-backed vbds. Signed-off-by: Keir Fraser --- tools/ioemu/block-raw.c | 2 -- tools/ioemu/block.c | 5 +---- tools/ioemu/block_int.h | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/ioemu/block-raw.c b/tools/ioemu/block-raw.c index f0ad65e0a7..182d2ec55e 100644 --- a/tools/ioemu/block-raw.c +++ b/tools/ioemu/block-raw.c @@ -1489,7 +1489,5 @@ BlockDriver bdrv_host_device = { .bdrv_pread = raw_pread, .bdrv_pwrite = raw_pwrite, .bdrv_getlength = raw_getlength, - - .bdrv_flags = BLOCK_DRIVER_FLAG_EXTENDABLE }; #endif /* _WIN32 */ diff --git a/tools/ioemu/block.c b/tools/ioemu/block.c index c9e27d1191..6e8f8cc737 100644 --- a/tools/ioemu/block.c +++ b/tools/ioemu/block.c @@ -350,11 +350,8 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags, bs->is_temporary = 0; bs->encrypted = 0; - if (flags & BDRV_O_EXTENDABLE) { - if (!(drv->bdrv_flags & BLOCK_DRIVER_FLAG_EXTENDABLE)) - return -ENOSYS; + if (flags & BDRV_O_EXTENDABLE) bs->extendable = 1; - } if (flags & BDRV_O_SNAPSHOT) { BlockDriverState *bs1; diff --git a/tools/ioemu/block_int.h b/tools/ioemu/block_int.h index fba27c2c35..c7a9d197b3 100644 --- a/tools/ioemu/block_int.h +++ b/tools/ioemu/block_int.h @@ -24,8 +24,6 @@ #ifndef BLOCK_INT_H #define BLOCK_INT_H -#define BLOCK_DRIVER_FLAG_EXTENDABLE 0x0001u - struct BlockDriver { const char *format_name; int instance_size; @@ -78,7 +76,6 @@ struct BlockDriver { int (*bdrv_eject)(BlockDriverState *bs, int eject_flag); int (*bdrv_set_locked)(BlockDriverState *bs, int locked); - unsigned bdrv_flags; BlockDriverAIOCB *free_aiocb; struct BlockDriver *next; }; -- 2.30.2